Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

task/WG-96 add assets to original questionnaire code #144

Conversation

nathanfranklin
Copy link
Collaborator

@nathanfranklin nathanfranklin commented Jun 30, 2023

Overview:

This PR updates the frontend viewing of RAPID questionnaires in order to show image assets

Related Jira tickets:

Testing Steps:

See steps at TACC-Cloud/geoapi#131

Notes:

Note: I also started to incorporate updated js from RAPID but stopped that to focus just on showing assets. That WIP code is at https://github.com/TACC-Cloud/hazmapper/tree/task/WG-96-add-assets-to-questionairre and the goal would be to just use un-changed js code to enable us to just drop in their changes without extra work making it typescript.

@nathanfranklin nathanfranklin marked this pull request as draft September 29, 2023 19:44
@nathanfranklin nathanfranklin changed the base branch from master to feature/questionnaire October 6, 2023 15:31
Copy link
Contributor

@taoteg taoteg left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Aside from a few syntax tweaks and the question of node version, LGTM!

Copy link
Contributor

@taoteg taoteg left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM!

Copy link
Contributor

@taoteg taoteg left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

So be it. =)

Copy link
Contributor

@sophia-massie sophia-massie left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM!

@nathanfranklin nathanfranklin merged commit bbbc869 into feature/questionnaire Oct 26, 2023
5 checks passed
@nathanfranklin nathanfranklin deleted the task/WG-96-add-assets-to-original-questionnaire-code branch October 26, 2023 21:26
nathanfranklin added a commit that referenced this pull request Dec 18, 2023
* task/WG-96 add assets to original questionnaire code (#144)

* Do not show _hazmapper properties

* Add ng-bootstrap to use carousel

* Add carasol to show questionnaire assets

* User correct version of npm so lock file doesn't change

* Switch CI to match our container's version of node

* Refactor into a component

* Remove bootstrap

* Use own-carousel for image asset carousel

* Fix linting

* Remove unintended blank line

* Revert "Switch CI to match our container's version of node"

This reverts commit 357027a.

* Fix weird formatting issues

* Revert "Revert "Switch CI to match our container's version of node""

This reverts commit 4077c5a.

* task/WG-173:show asset image alongside question in the questionnaire (#165)

* Show asset images with questions

* Fix prettier errors

* Remove reduntant types from JSDoc strings

* task/WG-167: Overhaul questionnaire style (#169)

* Initial commit to get the Questionnaire redesign rolling. Initial resize of the modal window to begin improving layout and styles.

* Added comment to evolving styles.

* Initial pass removing all font-sizes and color form the questionnaire modal. Next is to prune out the margins and spacing. Need clean, unstyled text in the UI to build new CSS back up on.

* Removed all font weighting, font type assignments and font size assignments from selectors in questionnaire modal.

* Commented out most of the styling in the questionnaire at this point.

* Have now commented out all styles that are not required for basic structure. Purging unused code next.

* Removed all unused selectors from the .styl document for questionnaire viewer. Ready to rebuild the style back up now.

* Completed the initial rebuild of the Questionnaire viewer styles to integrate with the Hazmapper design aesthetic. Still working on a few question types - ranged options specifically - but otherwise clean layout now.

* Added styling for the rangeAnswer elements. None of the questionnaire content indicates a selected state so I set a value anyway in case we update the view code to include that attribute.

* Changes the scope of image selectors in the questionnaire to only style images embedded within the questionnaire modal. Added support for both rangeSelect question and matrixTable question styling. Adjusted overall font sizes and layout for better legibility and use of white-space.

* Ran linting on the css.

* Cleaned up a mistake in css. Linting seems to regenerate unused style code locally. Investigating, but this commit is clean.

* task/wg-166-questionnaire-preview-title (#171)

* task/wg-166-questionnaire-preview-title

* Added padding for detail header for long titles

* Linting

* Prettier linting

* Revert style linting

* Remove event emitters, select node event and
selected tree node property, and use the activeFeature subscription
instead to pull the file name. Added a function to extract file name from
activeFeature display_path.

* Remove unused import

* Take file naming out of try block

* Remove diff

* A quick tweak to the Sub-question styling to clean it up a little and add some padding. (#174)

* Fix z-index of asset-detail so its below modal (#173)

* Task/wg 174 & 175 improve right panel questionnaire pic scroll and metadata (#176)

* task/WG-174-Improve-right-panel-questionnaire-metadata

* Used FeatureType() function to get find
questionnaire assets and consolidated logic

* task/WG-188: fix questionnaire detail panel (#177)

* Fix questionnaire-detail so it updates when feature changes

Also handle the cae where there are no properites._hazmapper.questionnaire.asset
because it is a questionnaire without assets

* Handle case when no feature is active

* Fix linting

* Rework layout of questionnaire to take all space (#178)

* Rework layout of questionnaire to take all space

* Fix linting

* Disable custom analytics-related headers (#179)

* Task/WG-171: Fix location question on questionnaire map (#186)

* Make map fill up the map container

* Add marker on location map

---------

Co-authored-by: John Gentle <[email protected]>
Co-authored-by: sophia-massie <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants